fix: handle valid JSON messages which are not GreengrassLogMessages #214
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MikeDombo
force-pushed
the
fix-null-level
branch
from
867b165 to
55b0f0d
Compare
MikeDombo
changed the title
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #214 +/- ##
==========================================
- Coverage 86.35% 85.36% -0.99%
==========================================
Files 13 13
Lines 1033 1052 +19
Branches 106 109 +3
==========================================
+ Hits 892 898 +6
- Misses 87 96 +9
- Partials 54 58 +4
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
|
Unit Tests Coverage Report
Minimum allowed coverage is Generated by 🐒 cobertura-action against 73b73c7 |
|
Integration Tests Coverage Report
Minimum allowed coverage is Generated by 🐒 cobertura-action against 73b73c7 |
K-AWS
reviewed
Oct 26, 2023
| String totalLogNumbers = "50"; | ||
| String fileSizeBytes = "1024"; | ||
| String fileSizeUnit = "KB"; | ||
| String componentName = "com.aws.greengrass.artifacts.LogGenerator"; | ||
| String activeFileName = logFileName + "." + logFileExtention; | ||
| String activeFileName = logFileName + ".log"; |
There was a problem hiding this comment.
Why are we moving from a variable to a hard coded string?
There was a problem hiding this comment.
This is a test (for a test), variable wasn't a variable but a constant.
saranyailla
reviewed
Oct 26, 2023
src/test/java/com/aws/greengrass/logmanager/CloudWatchAttemptLogsProcessorTest.java
Outdated
Show resolved
Hide resolved
MikeDombo
force-pushed
the
fix-null-level
branch
from
2ee0833 to
73b73c7
Compare
saranyailla
approved these changes
Oct 26, 2023
K-AWS
approved these changes
Oct 27, 2023
| @@ -17,19 +16,18 @@ public class LogGeneratorTest { | |||
| @TempDir | |||
| static Path tempPath; | |||
| String logFileName = "localtest"; | |||
| String logFileExtention = "log"; | |||
| String logWriteFreqSeconds = "0.1"; | |||
| String logWriteFreqMs = "100"; | |||
There was a problem hiding this comment.
Is someone going to think this is milliseconds and not messages per second?
There was a problem hiding this comment.
It is milliseconds. 0.1 seconds is 100 milliseconds.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
#213
Description of changes:
Handle the case where log level is null in deserialized JSON format logs. Log level is never supposed to be null, so this should only be possible if someone is not using the Greengrass logger (waiting for more customer info to determine this). Regardless, we should handle the case properly. Here we default to INFO level if the log level parsed from JSON is null or empty.
Why is this change necessary:
How was this change tested:
Updated existing test file with a null log level and verified that test fails without the fix and that it passes with the fix.
Any additional information or context required to review the change:
Checklist:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.